Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 10 Nov 2011 07:57:29 +0000 (23:57 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 10 Nov 2011 07:57:29 +0000 (23:57 -0800)
commitc4d6964ee96a1a87520ca9895ad70f4361fa3009
treecc4829c0c28f38e3c34d7f7d842d4693b77dbe96
parent97f40d36ac942d091a7695138985d4c3364b0c0a
parent6f0487eb2dc7d9c0aa840e84787f92f07e6a8940
Merge from trunk.